bf1652a66ccece31f99ab9bab75e0c69be2ccf29,core/src/androidTest/java/org/hisp/dhis/android/core/trackedentity/TrackedEntityAttributeModelIntegrationTests.java,TrackedEntityAttributeModelIntegrationTests,toContentValues_shouldConvertToContentValues,#,147

Before Change


        assertThat(contentValues.getAsString(TrackedEntityAttributeModel.Columns.EXPRESSION)).isEqualTo(EXPRESSION);
        assertThat(contentValues.getAsString(TrackedEntityAttributeModel.Columns.SEARCH_SCOPE)).isEqualTo(SEARCH_SCOPE.toString());
        assertThat(contentValues.getAsBoolean(TrackedEntityAttributeModel.Columns.PROGRAM_SCOPE)).isEqualTo(toBoolean(PROGRAM_SCOPE));
        assertThat(contentValues.getAsBoolean(TrackedEntityAttributeModel.Columns.DISPLAY_IN_LIST_NO_PROGRAM)).isEqualTo(toBoolean(DISPLAY_IN_LIST_NO_PROGRAM));
        assertThat(contentValues.getAsBoolean(TrackedEntityAttributeModel.Columns.GENERATED)).isEqualTo(toBoolean(GENERATED));
        assertThat(contentValues.getAsBoolean(TrackedEntityAttributeModel.Columns.DISPLAY_ON_VISIT_SCHEDULE)).isEqualTo(toBoolean(DISPLAY_ON_VISIT_SCHEDULE));
        assertThat(contentValues.getAsBoolean(TrackedEntityAttributeModel.Columns.ORG_UNIT_SCOPE)).isEqualTo(toBoolean(ORG_UNIT_SCOPE));

After Change


                .expression(EXPRESSION)
                .searchScope(SEARCH_SCOPE)
                .programScope(toBoolean(PROGRAM_SCOPE))
                .displayInListNoProgram(toBoolean(DISPLAY_IN_LIST_NO_PROGRAM))
                .generated(toBoolean(GENERATED))
                .displayOnVisitSchedule(toBoolean(DISPLAY_ON_VISIT_SCHEDULE))
                .orgUnitScope(toBoolean(ORG_UNIT_SCOPE))
                .unique(toBoolean(UNIQUE))
                .inherit(toBoolean(INHERIT))
                .build();
        ContentValues contentValues = model.toContentValues();

        assertThat(contentValues.getAsLong(Columns.ID)).isEqualTo(ID);
        assertThat(contentValues.getAsString(Columns.UID)).isEqualTo(UID);
        assertThat(contentValues.getAsString(Columns.CODE)).isEqualTo(CODE);
        assertThat(contentValues.getAsString(Columns.NAME)).isEqualTo(NAME);
        assertThat(contentValues.getAsString(Columns.DISPLAY_NAME)).isEqualTo(DISPLAY_NAME);
        assertThat(contentValues.getAsString(Columns.CREATED)).isEqualTo(dateString);
        assertThat(contentValues.getAsString(Columns.LAST_UPDATED)).isEqualTo(dateString);
        assertThat(contentValues.getAsString(Columns.SHORT_NAME)).isEqualTo(SHORT_NAME);
        assertThat(contentValues.getAsString(Columns.DISPLAY_SHORT_NAME)).isEqualTo(DISPLAY_SHORT_NAME);
        assertThat(contentValues.getAsString(Columns.DESCRIPTION)).isEqualTo(DESCRIPTION);
        assertThat(contentValues.getAsString(Columns.DISPLAY_DESCRIPTION)).isEqualTo(DISPLAY_DESCRIPTION);
        assertThat(contentValues.getAsString(Columns.PATTERN)).isEqualTo(PATTERN);
        assertThat(contentValues.getAsInteger(Columns.SORT_ORDER_IN_LIST_NO_PROGRAM))
                .isEqualTo(SORT_ORDER_IN_LIST_NO_PROGRAM);
        assertThat(contentValues.getAsString(Columns.OPTION_SET)).isEqualTo(OPTION_SET);
        assertThat(contentValues.getAsString(Columns.VALUE_TYPE)).isEqualTo(VALUE_TYPE.toString());
        assertThat(contentValues.getAsString(Columns.EXPRESSION)).isEqualTo(EXPRESSION);
        assertThat(contentValues.getAsString(Columns.SEARCH_SCOPE)).isEqualTo(SEARCH_SCOPE.toString());
        assertThat(contentValues.getAsBoolean(Columns.PROGRAM_SCOPE)).isEqualTo(toBoolean(PROGRAM_SCOPE));
        assertThat(contentValues.getAsBoolean(Columns.DISPLAY_IN_LIST_NO_PROGRAM))
                .isEqualTo(toBoolean(DISPLAY_IN_LIST_NO_PROGRAM));
        assertThat(contentValues.getAsBoolean(Columns.GENERATED)).isEqualTo(toBoolean(GENERATED));
        assertThat(contentValues.getAsBoolean(Columns.DISPLAY_ON_VISIT_SCHEDULE))
                .isEqualTo(toBoolean(DISPLAY_ON_VISIT_SCHEDULE));